From 4b60c40659b34b6577a6bc91eb4115458a0e425f Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 7 Aug 2018 11:00:50 +0100 Subject: [PATCH] x86: move arch_evtchn_inject to x86 common code It is not specific to HVM. It just so happens that PV doesn't need special handling. Signed-off-by: Wei Liu Acked-by: Jan Beulich --- xen/arch/x86/hvm/irq.c | 6 ------ xen/arch/x86/irq.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 8095c829b6..dfe8ed6385 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -577,12 +577,6 @@ int hvm_local_events_need_delivery(struct vcpu *v) return !hvm_interrupt_blocked(v, intack); } -void arch_evtchn_inject(struct vcpu *v) -{ - if ( is_hvm_vcpu(v) ) - hvm_assert_evtchn_irq(v); -} - static void irq_dump(struct domain *d) { struct hvm_irq *hvm_irq = hvm_domain_irq(d); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 7d0b19f2d2..6865c790ab 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2732,3 +2732,9 @@ int allocate_and_map_msi_pirq(struct domain *d, int index, int *pirq_p, return ret; } + +void arch_evtchn_inject(struct vcpu *v) +{ + if ( is_hvm_vcpu(v) ) + hvm_assert_evtchn_irq(v); +} -- 2.30.2